From 526257f26cab2967fdd758bb1f13323d4ece40b6 Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 25 Jun 2003 15:19:02 +0000 Subject: [PATCH] Fix gpsutil output. Deal with wreckage in test suite. --- gpsbabel/gpsutil.c | 4 ++-- gpsbabel/reference/cetus.gpu | 18 +++++++++--------- gpsbabel/reference/gu.wpt | 18 +++++++++--------- gpsbabel/testo | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.c index 4f7a86f80..9afee7cee 100644 --- a/gpsbabel/gpsutil.c +++ b/gpsbabel/gpsutil.c @@ -88,8 +88,8 @@ gpsutil_disp(const waypoint *wpt) icon_token = mag_find_token_from_descr(wpt->icon_descr); - lon = wpt->position.longitude.degrees * 100.0; - lat = wpt->position.latitude.degrees * 100.0; + lon = degrees2ddmm(wpt->position.longitude.degrees); + lat = degrees2ddmm(wpt->position.latitude.degrees); fprintf(file_out, "%-8s %08.3f%c %09.3f%c %07.0f%c %-30.30s %s\n", global_opts.synthesize_shortnames ? diff --git a/gpsbabel/reference/cetus.gpu b/gpsbabel/reference/cetus.gpu index 0a1905b65..c701f7040 100644 --- a/gpsbabel/reference/cetus.gpu +++ b/gpsbabel/reference/cetus.gpu @@ -1,9 +1,9 @@ -GC1A37 3609.068N 08667.955W 0000000m The Troll by a182pilot & Famil a -GC1C2B 3599.627N 08662.012W 0000000m Dive Bomber by JoGPS & family a -GC25A9 3603.848N 08664.862W 0000000m FOSTER by JoGPS & Family a -GC2723 3611.218N 08674.177W 0000000m Logan Lighthouse by JoGps & Fa a -GC2B71 3606.408N 08679.052W 0000000m Ganier Cache by Susy1313 a -GC309F 3608.777N 08680.973W 0000000m Shy's Hill by FireFighterEng33 a -GC317A 3605.750N 08689.200W 0000000m GittyUp by JoGPS / Warner Park a -GC317D 3608.280N 08686.728W 0000000m Inlighting by JoGPS / Warner P a -GCEBB 3597.203N 08713.470W 0000000m Mountain Bike Heaven by susy13 a +GC1A37 3605.441N 08640.773W 0000000m The Troll by a182pilot & Famil a +GC1C2B 3559.776N 08637.207W 0000000m Dive Bomber by JoGPS & family a +GC25A9 3602.309N 08638.917W 0000000m FOSTER by JoGPS & Family a +GC2723 3606.731N 08644.506W 0000000m Logan Lighthouse by JoGps & Fa a +GC2B71 3603.845N 08647.431W 0000000m Ganier Cache by Susy1313 a +GC309F 3605.266N 08648.584W 0000000m Shy's Hill by FireFighterEng33 a +GC317A 3603.450N 08653.520W 0000000m GittyUp by JoGPS / Warner Park a +GC317D 3604.968N 08652.037W 0000000m Inlighting by JoGPS / Warner P a +GCEBB 3558.322N 08708.082W 0000000m Mountain Bike Heaven by susy13 a diff --git a/gpsbabel/reference/gu.wpt b/gpsbabel/reference/gu.wpt index e23f70209..d2e1f3a51 100644 --- a/gpsbabel/reference/gu.wpt +++ b/gpsbabel/reference/gu.wpt @@ -1,9 +1,9 @@ -GCEBB 3597.203N 08713.470W 0000000m Mountain Bike Heaven by susy13 a -GC1A37 3609.068N 08667.955W 0000000m The Troll by a182pilot & Famil a -GC1C2B 3599.627N 08662.012W 0000000m Dive Bomber by JoGPS & family a -GC25A9 3603.848N 08664.862W 0000000m FOSTER by JoGPS & Family a -GC2723 3611.218N 08674.177W 0000000m Logan Lighthouse by JoGps & Fa a -GC2B71 3606.408N 08679.052W 0000000m Ganier Cache by Susy1313 a -GC309F 3608.777N 08680.973W 0000000m Shy's Hill by FireFighterEng33 a -GC317A 3605.750N 08689.200W 0000000m GittyUp by JoGPS / Warner Park a -GC317D 3608.280N 08686.728W 0000000m Inlighting by JoGPS / Warner P a +GCEBB 3558.322N 08708.082W 0000000m Mountain Bike Heaven by susy13 a +GC1A37 3605.441N 08640.773W 0000000m The Troll by a182pilot & Famil a +GC1C2B 3559.776N 08637.207W 0000000m Dive Bomber by JoGPS & family a +GC25A9 3602.309N 08638.917W 0000000m FOSTER by JoGPS & Family a +GC2723 3606.731N 08644.506W 0000000m Logan Lighthouse by JoGps & Fa a +GC2B71 3603.845N 08647.431W 0000000m Ganier Cache by Susy1313 a +GC309F 3605.266N 08648.584W 0000000m Shy's Hill by FireFighterEng33 a +GC317A 3603.450N 08653.520W 0000000m GittyUp by JoGPS / Warner Park a +GC317D 3604.968N 08652.037W 0000000m Inlighting by JoGPS / Warner P a diff --git a/gpsbabel/testo b/gpsbabel/testo index d9ffc76c4..d0478b728 100755 --- a/gpsbabel/testo +++ b/gpsbabel/testo @@ -151,7 +151,7 @@ ${PNAME} -i geo -f geocaching.loc -o magnav -F ${TMPDIR}/magnav.pdb ${PNAME} -i magnav -f ${TMPDIR}/magnav.pdb -o gpsutil -F ${TMPDIR}/magnav.gpu ${PNAME} -i magnav -f reference/magnav.pdb -o gpsutil -F ${TMPDIR}/magnavt.gpu compare ${TMPDIR}/magnavt.gpu ${TMPDIR}/magnav.gpu -compare reference/magnavr.gpu ${TMPDIR}/magnav.gpu +compare reference/gu.wpt ${TMPDIR}/magnav.gpu # GPSPilot Tracker for PalmOS # This test is eerily similar to the NAV Companion test. In fact, the @@ -161,7 +161,7 @@ ${PNAME} -i geo -f geocaching.loc -o gpspilot -F ${TMPDIR}/gpspilot.pdb ${PNAME} -i gpspilot -f ${TMPDIR}/gpspilot.pdb -o gpsutil -F ${TMPDIR}/gpspilot.gpu ${PNAME} -i gpspilot -f reference/gpspilot.pdb -o gpsutil -F ${TMPDIR}/gpspil_t.gpu compare ${TMPDIR}/gpspil_t.gpu ${TMPDIR}/gpspilot.gpu -compare reference/magnavr.gpu ${TMPDIR}/gpspilot.gpu +compare reference/gu.wpt ${TMPDIR}/gpspilot.gpu # Cetus GPS for PalmOS # This test is also similar to the NAV Companion test. -- 2.30.2